From: John Audia <therealgraysky@proton.me>
Date: Sat, 22 Mar 2025 17:08:29 +0000 (-0400)
Subject: coreutils: apply PKG_FIXUP conditionally
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=716cb3deac29163874be30ac59a668b3856dcc24;p=feed%2Fpackages.git

coreutils: apply PKG_FIXUP conditionally

PKG_FIXUP:=autoreconf introduced in this commit[1] to fix builds with GCC 14
does not play well with GCC 13. Apply it conditionally.

I build some coreutils packages under GCC 13 and again under GCC 14 and both
completed successfully.

Build system: x86/64
Build-tested: x86/64

Fixes https://github.com/openwrt/packages/issues/26175

1. https://github.com/openwrt/packages/commit/b1a648e1ff60932e2b8f65479da3059d1c1b8b58

Signed-off-by: John Audia <therealgraysky@proton.me>
---

diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile
index a8f71b513e..3e0bd1ed5a 100644
--- a/utils/coreutils/Makefile
+++ b/utils/coreutils/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coreutils
 PKG_VERSION:=9.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/coreutils
@@ -22,7 +22,9 @@ PKG_CPE_ID:=cpe:/a:gnu:coreutils
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
+ifeq ($(CONFIG_GCC_VERSION_14),y)
+	PKG_FIXUP:=autoreconf
+endif
 
 include $(INCLUDE_DIR)/package.mk